From fb2127452a357d9eb3d45d4a69a83756a5bd8682 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 25 Oct 2000 18:07:12 +0000 Subject: [PATCH] Include x11/gdkx.h only when building for X11. 2000-10-25 Tor Lillqvist * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. * gdk/win32/gdkdrawable-win32.c * gdk/win32/gdkimage-win32.c * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the X11 backend. * gdk/win32/gdkcc-win32.c * gdk/win32/gdkcolor-win32.c * gdk/win32/gdkfont-win32.c * gdk/win32/gdkinput-win32.c * gdk/win32/gdkmain-win32.c * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. --- ChangeLog | 16 +++++++++++ ChangeLog.pre-2-0 | 16 +++++++++++ ChangeLog.pre-2-10 | 16 +++++++++++ ChangeLog.pre-2-2 | 16 +++++++++++ ChangeLog.pre-2-4 | 16 +++++++++++ ChangeLog.pre-2-6 | 16 +++++++++++ ChangeLog.pre-2-8 | 16 +++++++++++ gdk/gdkwindow.c | 4 ++- gdk/win32/gdkcc-win32.c | 1 - gdk/win32/gdkcolor-win32.c | 18 +++++------- gdk/win32/gdkdrawable-win32.c | 11 ++++++++ gdk/win32/gdkfont-win32.c | 20 ++++++-------- gdk/win32/gdkimage-win32.c | 52 +++++++++++++++++------------------ gdk/win32/gdkinput-win32.c | 25 ++++++++--------- gdk/win32/gdkmain-win32.c | 2 -- gdk/win32/gdkprivate-win32.h | 8 ++++++ gdk/win32/gdkproperty-win32.c | 19 +++++++------ 17 files changed, 197 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 515530e8f0..f3c838f513 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2000-10-25 Tor Lillqvist + + * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. + + * gdk/win32/gdkdrawable-win32.c + * gdk/win32/gdkimage-win32.c + * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the + X11 backend. + + * gdk/win32/gdkcc-win32.c + * gdk/win32/gdkcolor-win32.c + * gdk/win32/gdkfont-win32.c + * gdk/win32/gdkinput-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. + 2000-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 515530e8f0..f3c838f513 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,19 @@ +2000-10-25 Tor Lillqvist + + * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. + + * gdk/win32/gdkdrawable-win32.c + * gdk/win32/gdkimage-win32.c + * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the + X11 backend. + + * gdk/win32/gdkcc-win32.c + * gdk/win32/gdkcolor-win32.c + * gdk/win32/gdkfont-win32.c + * gdk/win32/gdkinput-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. + 2000-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 515530e8f0..f3c838f513 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,19 @@ +2000-10-25 Tor Lillqvist + + * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. + + * gdk/win32/gdkdrawable-win32.c + * gdk/win32/gdkimage-win32.c + * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the + X11 backend. + + * gdk/win32/gdkcc-win32.c + * gdk/win32/gdkcolor-win32.c + * gdk/win32/gdkfont-win32.c + * gdk/win32/gdkinput-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. + 2000-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 515530e8f0..f3c838f513 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,19 @@ +2000-10-25 Tor Lillqvist + + * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. + + * gdk/win32/gdkdrawable-win32.c + * gdk/win32/gdkimage-win32.c + * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the + X11 backend. + + * gdk/win32/gdkcc-win32.c + * gdk/win32/gdkcolor-win32.c + * gdk/win32/gdkfont-win32.c + * gdk/win32/gdkinput-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. + 2000-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 515530e8f0..f3c838f513 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,19 @@ +2000-10-25 Tor Lillqvist + + * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. + + * gdk/win32/gdkdrawable-win32.c + * gdk/win32/gdkimage-win32.c + * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the + X11 backend. + + * gdk/win32/gdkcc-win32.c + * gdk/win32/gdkcolor-win32.c + * gdk/win32/gdkfont-win32.c + * gdk/win32/gdkinput-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. + 2000-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 515530e8f0..f3c838f513 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,19 @@ +2000-10-25 Tor Lillqvist + + * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. + + * gdk/win32/gdkdrawable-win32.c + * gdk/win32/gdkimage-win32.c + * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the + X11 backend. + + * gdk/win32/gdkcc-win32.c + * gdk/win32/gdkcolor-win32.c + * gdk/win32/gdkfont-win32.c + * gdk/win32/gdkinput-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. + 2000-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 515530e8f0..f3c838f513 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,19 @@ +2000-10-25 Tor Lillqvist + + * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11. + + * gdk/win32/gdkdrawable-win32.c + * gdk/win32/gdkimage-win32.c + * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the + X11 backend. + + * gdk/win32/gdkcc-win32.c + * gdk/win32/gdkcolor-win32.c + * gdk/win32/gdkfont-win32.c + * gdk/win32/gdkinput-win32.c + * gdk/win32/gdkmain-win32.c + * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall. + 2000-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 70851b01f5..c4c2419511 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -680,8 +680,10 @@ gdk_window_paint_init_bg (GdkWindow *window, gdk_gc_unref (tmp_gc); } - +#ifdef GDK_WINDOWING_X11 #include "x11/gdkx.h" +#endif + void gdk_window_begin_paint_region (GdkWindow *window, GdkRegion *region) diff --git a/gdk/win32/gdkcc-win32.c b/gdk/win32/gdkcc-win32.c index f3a8aab7e0..a5fc362b40 100644 --- a/gdk/win32/gdkcc-win32.c +++ b/gdk/win32/gdkcc-win32.c @@ -276,7 +276,6 @@ init_color (GdkColorContext *cc) static void init_true_color (GdkColorContext *cc) { - GdkColorContextPrivate *ccp = (GdkColorContextPrivate *) cc; gulong rmask, gmask, bmask; cc->mode = GDK_CC_MODE_TRUE; diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c index 1d5af59f7c..311ad4a02f 100644 --- a/gdk/win32/gdkcolor-win32.c +++ b/gdk/win32/gdkcolor-win32.c @@ -257,7 +257,6 @@ alloc_color(Colormap colormap, gulong *pixelp) { PALETTEENTRY entry, closeEntry; - HDC hdc; unsigned int i; entry = *color; @@ -442,7 +441,6 @@ create_colormap (HWND w, { char logPalBuf[sizeof(LOGPALETTE) + 256 * sizeof(PALETTEENTRY)]; LOGPALETTE *logPalettePtr; - PALETTEENTRY *entryPtr; Colormap colormap; guint i; HPALETTE sysPal; @@ -1387,7 +1385,6 @@ static Colormap default_colormap () { static Colormap colormap; - gint i; if (colormap) return colormap; @@ -1403,7 +1400,6 @@ gdk_colormap_new (GdkVisual *visual, GdkColormap *colormap; GdkColormapPrivateWin32 *private; Visual *xvisual; - int size; int i; g_return_val_if_fail (visual != NULL, NULL); @@ -1463,6 +1459,9 @@ gdk_colormap_new (GdkVisual *visual, private->xcolormap = create_colormap (gdk_root_window, xvisual, FALSE); break; + + case GDK_VISUAL_DIRECT_COLOR: + g_assert_not_reached (); } gdk_colormap_add (colormap); @@ -1520,7 +1519,6 @@ gdk_colormap_get_system (void) { static GdkColormap *colormap = NULL; GdkColormapPrivateWin32 *private; - gint i; if (!colormap) { @@ -1581,11 +1579,7 @@ gdk_colormap_change (GdkColormap *colormap, gint ncolors) { GdkColormapPrivateWin32 *private; - GdkVisual *visual; XColor *palette; - gint shift; - int max_colors; - int size; int i; g_return_if_fail (GDK_IS_COLORMAP (colormap)); @@ -1654,7 +1648,6 @@ gdk_color_parse (const gchar *spec, GdkColor *color) { Colormap xcolormap; - XColor xcolor; g_return_val_if_fail (spec != NULL, FALSE); g_return_val_if_fail (color != NULL, FALSE); @@ -2150,6 +2143,9 @@ gdk_colormap_alloc_colors (GdkColormap *colormap, nremaining++; } break; + + case GDK_VISUAL_DIRECT_COLOR: + g_assert_not_reached (); } return nremaining; } @@ -2276,7 +2272,7 @@ gdk_win32_color_to_string (const GdkColor *color) { static char buf[100]; - sprintf (buf, "(%.04x,%.04x,%.04x):%.06x", + sprintf (buf, "(%.04x,%.04x,%.04x):%.06lx", color->red, color->green, color->blue, color->pixel); return buf; diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index 52679dc0ec..4f9a040996 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -111,6 +111,8 @@ static GdkColormap* gdk_win32_get_colormap (GdkDrawable *drawable); static gint gdk_win32_get_depth (GdkDrawable *drawable); +static GdkVisual* gdk_win32_get_visual (GdkDrawable *drawable); + static void gdk_drawable_impl_win32_class_init (GdkDrawableImplWin32Class *klass); static gpointer parent_class = NULL; @@ -167,6 +169,9 @@ gdk_drawable_impl_win32_class_init (GdkDrawableImplWin32Class *klass) drawable_class->get_colormap = gdk_win32_get_colormap; drawable_class->get_depth = gdk_win32_get_depth; + drawable_class->get_visual = gdk_win32_get_visual; + + drawable_class->get_image = _gdk_win32_get_image; } /***************************************************** @@ -989,3 +994,9 @@ gdk_win32_get_depth (GdkDrawable *drawable) return gdk_drawable_get_depth (GDK_DRAWABLE_IMPL_WIN32 (drawable)->wrapper); } + +static GdkVisual* +gdk_win32_get_visual (GdkDrawable *drawable) +{ + return gdk_drawable_get_visual (GDK_DRAWABLE_IMPL_WIN32 (drawable)->wrapper); +} diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c index 952b36ab6a..afef386587 100644 --- a/gdk/win32/gdkfont-win32.c +++ b/gdk/win32/gdkfont-win32.c @@ -25,6 +25,7 @@ */ #include +#include #include #include @@ -1148,8 +1149,8 @@ gdk_font_load_logfont (LOGFONT *lfp) for (tries = 0; ; tries++) { - GDK_NOTE (MISC, g_print ("... trying %d,%d,%d,%d," - "%d,%d,%d,%d," + GDK_NOTE (MISC, g_print ("... trying %ld,%ld,%ld,%ld," + "%ld,%d,%d,%d," "%d,%d,%d," "%d,%#.02x,\"%s\"\n", lfp->lfHeight, lfp->lfWidth, @@ -1229,7 +1230,7 @@ gdk_font_load_logfont (LOGFONT *lfp) singlefont->codepage = 0; GDK_NOTE (MISC, (g_print ("... = %#x %s cs %s cp%d\n", - singlefont->hfont, face, + (guint) singlefont->hfont, face, charset_name (singlefont->charset), singlefont->codepage), g_print ("... Unicode subranges:"), @@ -1244,8 +1245,6 @@ gdk_font_load_logfont (LOGFONT *lfp) static GdkWin32SingleFont * gdk_font_load_internal (const gchar *font_name) { - GdkWin32SingleFont *singlefont; - LOGFONT logfont; char *fn; @@ -1488,7 +1487,6 @@ gdk_font_from_one_singlefont (GdkWin32SingleFont *singlefont) GdkFont *font; GdkFontPrivateWin32 *private; HGDIOBJ oldfont; - HANDLE *f; TEXTMETRIC textmetric; private = g_new (GdkFontPrivateWin32, 1); @@ -1586,9 +1584,7 @@ gdk_fontset_load (const gchar *fontset_name) GdkFontPrivateWin32 *private; GdkWin32SingleFont *singlefont; HGDIOBJ oldfont; - HANDLE *f; TEXTMETRIC textmetric; - GSList *base_font_list = NULL; gchar *fs; gchar *b, *p, *s; @@ -1663,7 +1659,7 @@ _gdk_font_destroy (GdkFont *font) singlefont = (GdkWin32SingleFont *) private->fonts->data; GDK_NOTE (MISC, g_print ("_gdk_font_destroy %#x\n", - singlefont->hfont)); + (guint)singlefont->hfont)); gdk_font_hash_remove (font->type, font); @@ -1772,6 +1768,8 @@ unicode_classify (wchar_t wc) else return -1; } + /* NOTREACHED */ + return -1; } void @@ -1787,7 +1785,7 @@ gdk_wchar_text_handle (GdkFont *font, GdkFontPrivateWin32 *private; GdkWin32SingleFont *singlefont; GSList *list; - int i, block; + int block; const wchar_t *start, *end, *wcp; wcp = wcstr; @@ -1823,7 +1821,7 @@ gdk_wchar_text_handle (GdkFont *font, GDK_NOTE (MISC, g_print ("%d:%d:%d:%#x ", start-wcstr, wcp-wcstr, block, - (singlefont ? singlefont->hfont : 0))); + (singlefont ? (guint) singlefont->hfont : 0))); /* Call the callback function */ (*handler) (singlefont, start, wcp+1 - start, arg); diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c index a2bab3d2af..6507aff75d 100644 --- a/gdk/win32/gdkimage-win32.c +++ b/gdk/win32/gdkimage-win32.c @@ -320,14 +320,15 @@ gdk_image_new (GdkImageType type, } GdkImage* -gdk_image_get (GdkWindow *window, - gint x, - gint y, - gint width, - gint height) +_gdk_win32_get_image (GdkDrawable *drawable, + gint x, + gint y, + gint width, + gint height) { GdkImage *image; GdkImagePrivateWin32 *private; + GdkDrawableImplWin32 *impl; HDC hdc, memdc; struct { BITMAPINFOHEADER bmiHeader; @@ -342,27 +343,26 @@ gdk_image_get (GdkWindow *window, BITMAP bm; int i; - g_return_val_if_fail (GDK_IS_DRAWABLE (window), NULL); + g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL); - if (GDK_IS_WINDOW (window) && GDK_WINDOW_DESTROYED (window)) - return NULL; - - GDK_NOTE (MISC, g_print ("gdk_image_get: %#x %dx%d@+%d+%d\n", - (guint) GDK_DRAWABLE_HANDLE (window), + GDK_NOTE (MISC, g_print ("_gdk_win32_get_image: %#x %dx%d@+%d+%d\n", + (guint) GDK_DRAWABLE_HANDLE (drawable), width, height, x, y)); + impl = GDK_DRAWABLE_IMPL_WIN32 (drawable); + image = g_object_new (gdk_image_get_type (), NULL); private = IMAGE_PRIVATE_DATA (image); image->type = GDK_IMAGE_SHARED; - image->visual = gdk_drawable_get_visual (window); + image->visual = gdk_drawable_get_visual (drawable); image->width = width; image->height = height; /* This function is called both to blit from a window and from * a pixmap. */ - if (GDK_IS_PIXMAP (window)) + if (GDK_IS_PIXMAP (drawable)) { if ((hdc = CreateCompatibleDC (NULL)) == NULL) { @@ -370,14 +370,14 @@ gdk_image_get (GdkWindow *window, g_free (image); return NULL; } - if ((oldbitmap1 = SelectObject (hdc, GDK_PIXMAP_HBITMAP (window))) == NULL) + if ((oldbitmap1 = SelectObject (hdc, impl->handle)) == NULL) { WIN32_GDI_FAILED ("SelectObject"); DeleteDC (hdc); g_free (image); return NULL; } - GetObject (GDK_PIXMAP_HBITMAP (window), sizeof (BITMAP), &bm); + GetObject (impl->handle, sizeof (BITMAP), &bm); GDK_NOTE (MISC, g_print ("gdk_image_get: bmWidth:%ld bmHeight:%ld bmWidthBytes:%ld bmBitsPixel:%d\n", bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, bm.bmBitsPixel)); @@ -393,7 +393,7 @@ gdk_image_get (GdkWindow *window, } else { - if ((hdc = GetDC (GDK_WINDOW_HWND (window))) == NULL) + if ((hdc = GetDC (impl->handle)) == NULL) { WIN32_GDI_FAILED ("GetDC"); g_free (image); @@ -413,14 +413,14 @@ gdk_image_get (GdkWindow *window, if ((memdc = CreateCompatibleDC (hdc)) == NULL) { WIN32_GDI_FAILED ("CreateCompatibleDC"); - if (GDK_IS_PIXMAP (window)) + if (GDK_IS_PIXMAP (drawable)) { SelectObject (hdc, oldbitmap1); DeleteDC (hdc); } else { - ReleaseDC (GDK_WINDOW_HWND (window), hdc); + ReleaseDC (impl->handle, hdc); } g_free (image); return NULL; @@ -461,14 +461,14 @@ gdk_image_get (GdkWindow *window, { WIN32_GDI_FAILED ("CreateDIBSection"); DeleteDC (memdc); - if (GDK_IS_PIXMAP (window)) + if (GDK_IS_PIXMAP (drawable)) { SelectObject (hdc, oldbitmap1); DeleteDC (hdc); } else { - ReleaseDC (GDK_WINDOW_HWND (window), hdc); + ReleaseDC (impl->handle, hdc); } g_free (image); return NULL; @@ -479,14 +479,14 @@ gdk_image_get (GdkWindow *window, WIN32_GDI_FAILED ("SelectObject"); DeleteObject (private->hbitmap); DeleteDC (memdc); - if (GDK_IS_PIXMAP (window)) + if (GDK_IS_PIXMAP (drawable)) { SelectObject (hdc, oldbitmap1); DeleteDC (hdc); } else { - ReleaseDC (GDK_WINDOW_HWND (window), hdc); + ReleaseDC (impl->handle, hdc); } g_free (image); return NULL; @@ -498,14 +498,14 @@ gdk_image_get (GdkWindow *window, SelectObject (memdc, oldbitmap2); DeleteObject (private->hbitmap); DeleteDC (memdc); - if (GDK_IS_PIXMAP (window)) + if (GDK_IS_PIXMAP (drawable)) { SelectObject (hdc, oldbitmap1); DeleteDC (hdc); } else { - ReleaseDC (GDK_WINDOW_HWND (window), hdc); + ReleaseDC (impl->handle, hdc); } g_free (image); return NULL; @@ -517,14 +517,14 @@ gdk_image_get (GdkWindow *window, if (!DeleteDC (memdc)) WIN32_GDI_FAILED ("DeleteDC"); - if (GDK_IS_PIXMAP (window)) + if (GDK_IS_PIXMAP (drawable)) { SelectObject (hdc, oldbitmap1); DeleteDC (hdc); } else { - ReleaseDC (GDK_WINDOW_HWND (window), hdc); + ReleaseDC (impl->handle, hdc); } switch (image->depth) diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c index c6e0c9fed5..8e258bcfa0 100644 --- a/gdk/win32/gdkinput-win32.c +++ b/gdk/win32/gdkinput-win32.c @@ -198,14 +198,14 @@ print_lc(LOGCONTEXT *lc) if (lc->lcMoveMask & PK_ROTATION) g_print (" PK_ROTATION"); g_print ("\n"); g_print ("lcBtnDnMask = %#x, lcBtnUpMask = %#x\n", - lc->lcBtnDnMask, lc->lcBtnUpMask); - g_print ("lcInOrgX = %d, lcInOrgY = %d, lcInOrgZ = %d\n", + (guint) lc->lcBtnDnMask, (guint) lc->lcBtnUpMask); + g_print ("lcInOrgX = %ld, lcInOrgY = %ld, lcInOrgZ = %ld\n", lc->lcInOrgX, lc->lcInOrgY, lc->lcInOrgZ); - g_print ("lcInExtX = %d, lcInExtY = %d, lcInExtZ = %d\n", + g_print ("lcInExtX = %ld, lcInExtY = %ld, lcInExtZ = %ld\n", lc->lcInExtX, lc->lcInExtY, lc->lcInExtZ); - g_print ("lcOutOrgX = %d, lcOutOrgY = %d, lcOutOrgZ = %d\n", + g_print ("lcOutOrgX = %ld, lcOutOrgY = %ld, lcOutOrgZ = %ld\n", lc->lcOutOrgX, lc->lcOutOrgY, lc->lcOutOrgZ); - g_print ("lcOutExtX = %d, lcOutExtY = %d, lcOutExtZ = %d\n", + g_print ("lcOutExtX = %ld, lcOutExtY = %ld, lcOutExtZ = %ld\n", lc->lcOutExtX, lc->lcOutExtY, lc->lcOutExtZ); g_print ("lcSensX = %g, lcSensY = %g, lcSensZ = %g\n", lc->lcSensX / 65536., lc->lcSensY / 65536., lc->lcSensZ / 65536.); @@ -231,7 +231,7 @@ gdk_input_wintab_init (void) UINT ndevices, ncursors, ncsrtypes, firstcsr, hardware; BOOL active; AXIS axis_x, axis_y, axis_npressure, axis_or[3]; - int i, j, k; + int i, k; int devix, cursorix; char devname[100], csrname[100]; @@ -358,7 +358,7 @@ gdk_input_wintab_init (void) g_warning ("gdk_input_init: WTOpen failed"); return; } - GDK_NOTE (MISC, g_print ("opened Wintab device %d %#x\n", + GDK_NOTE (MISC, g_print ("opened Wintab device %d %p\n", devix, *hctx)); wintab_contexts = g_list_append (wintab_contexts, hctx); @@ -747,7 +747,7 @@ _gdk_input_other_event (GdkEvent *event, GDK_NOTE (EVENTS, g_print ("gdk_input_win32_other_event: window=%#x (%d,%d)\n", - GDK_WINDOW_HWND (window), x, y)); + (guint) GDK_WINDOW_HWND (window), x, y)); #else /* ??? This code is pretty bogus */ @@ -854,7 +854,7 @@ _gdk_input_other_event (GdkEvent *event, x = pt.x; y = pt.y; GDK_NOTE (EVENTS, g_print ("...propagating to %#x, (%d,%d)\n", - GDK_WINDOW_HWND (window), x, y)); + (guint) GDK_WINDOW_HWND (window), x, y)); goto dijkstra; } @@ -1016,16 +1016,15 @@ _gdk_input_grab_pointer (GdkWindow *window, gboolean need_ungrab; GdkDevicePrivate *gdkdev; GList *tmp_list; - gint result; tmp_list = gdk_input_windows; new_window = NULL; need_ungrab = FALSE; GDK_NOTE (MISC, g_print ("gdk_input_win32_grab_pointer: %#x %d %#x\n", - GDK_WINDOW_HWND (window), + (guint) GDK_WINDOW_HWND (window), owner_events, - (confine_to ? GDK_WINDOW_HWND (confine_to) : 0))); + (confine_to ? (guint) GDK_WINDOW_HWND (confine_to) : 0))); while (tmp_list) { @@ -1158,8 +1157,6 @@ gdk_device_get_state (GdkDevice *device, gdouble *axes, GdkModifierType *mask) { - gint i; - g_return_if_fail (device != NULL); g_return_if_fail (GDK_IS_WINDOW (window)); diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 7d24cbe1b0..413ff487a3 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -69,8 +69,6 @@ gboolean _gdk_windowing_init_check (int argc, char **argv) { - gint i, j, k; - #ifdef HAVE_WINTAB if (getenv ("GDK_IGNORE_WINTAB") != NULL) gdk_input_ignore_wintab = TRUE; diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index 8b855252e1..3111303cfd 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -50,8 +50,16 @@ void gdk_win32_handle_table_remove (HANDLE handle); GdkGC * _gdk_win32_gc_new (GdkDrawable *drawable, GdkGCValues *values, GdkGCValuesMask values_mask); + +GdkImage* _gdk_win32_get_image (GdkDrawable *drawable, + gint x, + gint y, + gint width, + gint height); + COLORREF gdk_colormap_color (GdkColormap *colormap, gulong pixel); + HRGN BitmapToRegion (HBITMAP hBmp); gchar *gdk_font_full_name_get (GdkFont *font); diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index d966be8d03..598a0841a9 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -103,7 +103,7 @@ gdk_atom_name (GdkAtom atom) case GDK_SELECTION_TYPE_STRING: return g_strdup ("STRING"); } if (atom < 0xC000) - return g_strdup_printf ("#%x", atom); + return g_strdup_printf ("#%x", (guint) atom); else if (GlobalGetAtomName (atom, name, sizeof (name)) == 0) return NULL; return g_strdup (name); @@ -156,8 +156,9 @@ gdk_property_change (GdkWindow *window, (prop_name = gdk_atom_name (property), type_name = gdk_atom_name (type), g_print ("gdk_property_change: %#x %#x (%s) %#x (%s) %s %d*%d bytes %.10s\n", - GDK_WINDOW_HWND (window), property, prop_name, - type, type_name, + (guint) GDK_WINDOW_HWND (window), + (guint) property, prop_name, + (guint) type, type_name, (mode == GDK_PROP_MODE_REPLACE ? "REPLACE" : (mode == GDK_PROP_MODE_PREPEND ? "PREPEND" : (mode == GDK_PROP_MODE_APPEND ? "APPEND" : @@ -177,7 +178,7 @@ gdk_property_change (GdkWindow *window, length++; #if 1 GDK_NOTE (MISC, g_print ("...OpenClipboard(%#x)\n", - GDK_WINDOW_HWND (window))); + (guint) GDK_WINDOW_HWND (window))); if (!OpenClipboard (GDK_WINDOW_HWND (window))) { WIN32_API_FAILED ("OpenClipboard"); @@ -186,7 +187,7 @@ gdk_property_change (GdkWindow *window, #endif hdata = GlobalAlloc (GMEM_MOVEABLE|GMEM_DDESHARE, length + 1); ptr = GlobalLock (hdata); - GDK_NOTE (MISC, g_print ("...hdata=%#x, ptr=%#x\n", hdata, ptr)); + GDK_NOTE (MISC, g_print ("...hdata=%#x, ptr=%p\n", (guint) hdata, ptr)); for (i = 0; i < nelements; i++) { @@ -197,7 +198,7 @@ gdk_property_change (GdkWindow *window, *ptr++ = '\0'; GlobalUnlock (hdata); GDK_NOTE (MISC, g_print ("...SetClipboardData(CF_TEXT, %#x)\n", - hdata)); + (guint) hdata)); if (!SetClipboardData(CF_TEXT, hdata)) WIN32_API_FAILED ("SetClipboardData"); #if 1 @@ -214,7 +215,7 @@ void gdk_property_delete (GdkWindow *window, GdkAtom property) { - gchar *prop_name, *type_name; + gchar *prop_name; extern void gdk_selection_property_delete (GdkWindow *); g_return_if_fail (window != NULL); @@ -223,8 +224,8 @@ gdk_property_delete (GdkWindow *window, GDK_NOTE (MISC, (prop_name = gdk_atom_name (property), g_print ("gdk_property_delete: %#x %#x (%s)\n", - (window ? GDK_WINDOW_HWND (window) : 0), - property, prop_name), + (window ? (guint) GDK_WINDOW_HWND (window) : 0), + (guint) property, prop_name), g_free (prop_name))); if (property == gdk_selection_property) -- 2.30.2